--- ./lib/plugins/tumblr/assistant.py.orig	2013-09-01 12:06:59.000000000 +0000
+++ ./lib/plugins/tumblr/assistant.py	2014-07-14 18:31:47.000000000 +0000
@@ -6,6 +6,7 @@
 
 import re
 import json
+import sys
 
 from gi.repository import Gtk, Gdk
 
@@ -16,6 +17,9 @@
 from ..base.authwebkit import AuthWebKitScrolledWindow
 from account import AuthorizedTumblrAccount
 
+_encoding = sys.getfilesystemencoding()
+if _encoding is None:
+    _encoding = 'utf-8'
 
 class TumblrAuthAssistant(Gtk.Assistant):
 
@@ -36,7 +40,7 @@
 
         # page 1
         page1 = gui.get_object('label1')
-        page1.set_text(page1.get_text().decode('utf-8') % _('Tumblr'))
+        page1.set_text(page1.get_text().decode(_encoding) % _('Tumblr'))
         self.append_page(page1)
 
         self.set_page_title(page1, _('Intro'))
@@ -59,7 +63,7 @@
         # page 3
         page3 = gui.get_object('box2')
         confirm_label = gui.get_object('label6')
-        confirm_label.set_text(confirm_label.get_text().decode('utf-8') 
+        confirm_label.set_text(confirm_label.get_text().decode(_encoding) 
                                % _('Tumblr'))
         self.append_page(page3)
 
